From 12c05f0e2505b1fe287e6acb57b828622dffbbe4 Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Tue, 10 May 2005 22:28:46 +0000
Subject: [PATCH] bitkeeper revision 1.1389.15.6
 (4281359ejSQPcJ7qoKDaeTFt7zBKUg)

Clean up #include in a few places, and fix non-CONFIG_SMP builds.
xen/slab.h has unused __ARCH_HAS_SLAB_ALLOCATOR removed, but I added
back include xen/mm.h for the time being -- it can go after ia64 is
cleaned up to include mm.h only where necessary.
Signed-off-by: Keir Fraser <keir@xensource.com>
---
 xen/common/page_alloc.c      | 1 +
 xen/common/schedule.c        | 1 +
 xen/drivers/char/console.c   | 2 +-
 xen/include/asm-x86/shadow.h | 1 +
 xen/include/xen/cpumask.h    | 2 ++
 xen/include/xen/slab.h       | 9 +--------
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index fb26edc69c..5a4115c82e 100644
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -28,6 +28,7 @@
 #include <xen/sched.h>
 #include <xen/spinlock.h>
 #include <xen/slab.h>
+#include <xen/mm.h>
 #include <xen/irq.h>
 #include <xen/softirq.h>
 #include <xen/shadow.h>
diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index fb2db1b30f..491c2f22ac 100644
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -34,6 +34,7 @@
 #include <xen/sched-if.h>
 #include <xen/softirq.h>
 #include <xen/trace.h>
+#include <xen/mm.h>
 #include <public/sched_ctl.h>
 
 /* opt_sched: scheduler - default to Borrowed Virtual Time */
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index f20d664c91..d9eb0c474a 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -17,8 +17,8 @@
 #include <xen/console.h>
 #include <xen/serial.h>
 #include <xen/keyhandler.h>
+#include <xen/mm.h>
 #include <asm/uaccess.h>
-#include <asm/mm.h>
 #include <asm/debugger.h>
 #include <asm/io.h>
 
diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index d991a51f93..202453194f 100644
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -26,6 +26,7 @@
 #include <xen/types.h>
 #include <xen/perfc.h>
 #include <xen/sched.h>
+#include <xen/mm.h>
 #include <asm/processor.h>
 #include <asm/domain_page.h>
 #include <public/dom0_ops.h>
diff --git a/xen/include/xen/cpumask.h b/xen/include/xen/cpumask.h
index 33723fbd9a..4881447842 100644
--- a/xen/include/xen/cpumask.h
+++ b/xen/include/xen/cpumask.h
@@ -9,7 +9,9 @@
 
 typedef u32 cpumask_t;
 
+#ifndef cpu_online_map
 extern cpumask_t cpu_online_map;
+#endif
 
 static inline int cpus_weight(cpumask_t w)
 {
diff --git a/xen/include/xen/slab.h b/xen/include/xen/slab.h
index c4c8231f78..a3a7daf7d6 100644
--- a/xen/include/xen/slab.h
+++ b/xen/include/xen/slab.h
@@ -3,12 +3,7 @@
 #define __SLAB_H__
 
 #include <xen/config.h>
-
-#ifdef __ARCH_HAS_SLAB_ALLOCATOR
-
-#include <asm/slab.h>
-
-#else
+#include <xen/mm.h>
 
 /* Allocate space for typed object. */
 #define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))
@@ -32,6 +27,4 @@ static inline void *_xmalloc_array(size_t size, size_t align, size_t num)
  	return _xmalloc(size * num, align);
 }
 
-#endif /* __ARCH_HAS_SLAB_ALLOCATOR */
-
 #endif /* __SLAB_H__ */
-- 
2.30.2